More error checking added on start