Change return values to null not false
Remove exceptions, unnecessary