Better error checking
1.1.2