Improved conditional checks so no errors are thrown
0.1.1