Fixing controller crash in case of null pointer
Adding missing resources.