Fixed maven bugs
Exception handling