Removed some useless error handling