Removed exception to not break code.
Fixed watchdog
Fixed watchdog again
Merge pull request #62 from Activelamp-Ian/master

Removed exception to not break code.