Feature/user defined error

This Pull-Request is continued from #722