Bundle quick and dirty fix

Rename, remove first line (start with services)
Return the error here too.