Removed redundant call, added more info to logging and added early check