Cleanup
Fixed error messaging