Moved out non catcable errors in specs
Ensure return value