Getting rid of exception class
Fixing merge issues