Fixed some minor things.
Patched minor issue with error message.