Added new exception + psr-2 fixes