Implemented a small work around for no current window being set while executing the...