Fixed for unidentified exceptions