- fixed the null return when an error occurred an exception is thrown now