Fixed error raised as a result of unexpected or no arguments