(Frontend:) formatting and additional error-handling
no new functionality [ci skip]