Fixed NullPointer in PopOverShell

Improvements:
- PopOverShell was throwing a NullPointerException in a specific instance, a simple guard appears to work.