Ebrahim-Khalil Hassen
fix 500 errors #zap