Fix catch upper case as type recognition. Closes #525

Commit to fix issue. Please merge.