Added a few missing Error Checks